From: Joey Hess <joeyh@joeyh.name>
Date: Mon, 22 Sep 2025 19:00:26 +0000 (-0400)
Subject: fix test suite
X-Git-Tag: archive/raspbian/10.20251029-1+rpi1~1^2~3^2~77
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22Program/%22http:/www.example.com/cgi/%22https:/%22Program?a=commitdiff_plain;h=722a215354f2c8a2a4f21eb1ce3942343027b132;p=git-annex.git

fix test suite

dfbf76e2ca50d31eca6dee253c5bf3c892301463 broke it.

enableremote with the same type= as initremote had before might be worth
allowing, but I'll wait and see if someone else complains
---

diff --git a/Test.hs b/Test.hs
index 6de37709dc..008d525d80 100644
--- a/Test.hs
+++ b/Test.hs
@@ -1918,19 +1918,19 @@ test_gpg_crypto = do
   where
 	testscheme scheme = intmpclonerepo $ test_with_gpg $ \gpgcmd environ -> do
 		createDirectory (literalOsPath "dir")
-		let initps =
+		let ps =
 			[ "foo"
-			, "type=directory"
 			, "encryption=" ++ scheme
 			, "directory=dir"
 			, "highRandomQuality=false"
 			] ++ if scheme `elem` ["hybrid","pubkey"]
 				then ["keyid=" ++ Utility.Gpg.testKeyId]
 				else []
+		let initps = ps ++ [ "type=directory" ]
 		git_annex' "initremote" initps (Just environ) "initremote"
 		git_annex_shouldfail' "initremote" initps (Just environ) "initremote should not work when run twice in a row"
-		git_annex' "enableremote" initps (Just environ) "enableremote"
-		git_annex' "enableremote" initps (Just environ) "enableremote when run twice in a row"
+		git_annex' "enableremote" ps (Just environ) "enableremote"
+		git_annex' "enableremote" ps (Just environ) "enableremote when run twice in a row"
 		git_annex' "get" [annexedfile] (Just environ) "get of file"
 		annexed_present annexedfile
 		git_annex' "copy" [annexedfile, "--to", "foo"] (Just environ) "copy --to encrypted remote"